Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 8 Dec 2011 05:23:56 +0000 (21:23 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 8 Dec 2011 05:23:56 +0000 (21:23 -0800)
commitc335f0e9257e0e2525eb3439412e7c38a8a94e26
tree473dc6bda2861c2e29b80b64751fc0d25a11fb5b
parent356ae514f342cbd6b448d7f04fce4b4ce385d29e
parentdb237c2fd49e32abba5b9168f6c4881bfe48436d
Merge from trunk.